Seb/quick changes

Per our previous exchange, here are some changes.
Unfortunately, I couldn't easily create a branch for each one of them, as my editor was wreaking havoc on your tab/spaces/eol. Each change/feature is in its own commit though.
Thank you