Fully fixes #96
Closes #100
Squashed commits.
Wow, @50Wliu has an odd taste in formatting...
Changed a few things.
Left some things here just for needed ness.