Fixes and suggestions

Suggestions are marked with '##'.