Doc fixes

Do not merge yet. More fixes to be added!