Added a handful of fixme's...should be a lot more. Most have to do with backwards compatibility....