Trying to close issues #11, #14, #9, & #5 again :)

Last 3 commits cover these.