Bugfixes

Fixed a page or so of bugfixes, but my website went down, so stopping
here for the night. Wheeee!