Initial Fixes/Suggestions

I made all of the commits as compartmentalized as I could. Hopefully you shouldn't have any problems in you want to only cherry-pick certain ones.