Some fixes, lint and spec/unit support

Hi Robbie,

I finally found the time to make a PR :)

Cheers,