first set of remarks solved

more to come, but I want to keep the PRs manageable so you can review them quickly