Minor Tweaks

Not sure what all I did exactly but I wanted to stop working on it so
I'm just pushing what i have.