Changes from community feedback

I.e. making it more awesome