Fully fixed issues #11, #12, and #14

@bronhuston

~requested: ~500 points