Minor improvements (2)

Refs #2 #4.

@GoalSmashers: please verify the changes in the last patch are ok and let me know if you need me to make any changes.