Various Tweaks

fixed up a few minor things, need to clean things up though.