some cleanup, removed some FIXMEs