Multiple changes take a look

Hey I made several changes, I think they are good but please look them over and let me know what you think.