Various tweaks and improvements #31

Merged
merged 4 commits into from Dec 27, 2011