clean up
added FIXMEs