WIP: Make FIXME consistent so they can be grepped. Cleaning up some code. Added notes of things to fix.
5 files changed