Added a number of fixmes + some text reorganization