fix most of @WouterJ comments