Important Bug fixes and Improvements resulting from user testing

[prestoncabe]

see subtasks.

much of these have come from user testing of Prototype v2