Ooooh yeah
Tweaks and fixes