-Codechange: move things around some more
-Fix: some silly bugs