Lots more fixes

Fixed the messes I missed or added in the last commit. Lots of bugs; lots of ugly.
Also added my name.