bunch of tweaks cheers to @acook