added some FIXMEs -> please fix