Bug Fixes

I'd like to release a beta on the upcoming 1 year mark, so I'm doing bugfixes in anticipation of the beta.