Few changes and fixes

@Wouterrr See if you're interested in merging, couple of a few more changes incoming soon.

You can also reach me by e-mail if necessary.

Cheers,
Daniel Macedo