April2013hackfest

These commits should fix 2 more requested problems