fixed last remarks, added some FIXMEs for work to be done