Cleanup and fixes

Basically berkify everything and make it work out of the box :)