First round of tweaks...
More tweaks and changes :)