- Minor changes in reaction to Matthias FIXMEs