More minor tweaks. I realize I'm being annoying with my perfectionist traits
Fix merge conflicts