moved FIXMES to end of file
refactord config entry
0.5.2