Tweak
Get rid of alpha type stuff
Tweaks & clean ups