Fixing most of @normanmaurer's comments