Minor changes

Explanations for some changes are in the respective commit message
this is cool, but please remove the comment