Minor cleaning up right now
Minor fixes and changes