Small improvements

It looks like a lot of commits, and the main reason for that is I'm a rookie at git.
Tried to sync our repos via web gui, and it didn't really worked as I expected :)

Sorry about that.