Bugfix/full cleanup

Resolves #187, and by extension #178 and #143. :D