Added fix command and addressed issues

[robconery]

This should address some of the issues Burke brought up...

fixes #16 fixes #17 fixes #18

Only issue really is 18; but I think adding a message will work here.