update some text and add some FIXMEs
Merge branch 'review1-gert' into review1-osc