Minor improvements

This is what I've managed to contribute so far. I pretend to contribute more.

Please review my commits. Comments are VERY welcome :smiley: