Christmas commit

misc changes. Ongoing stuff. not even tested if was still compiling.