Added Lots of functionality
Made minor changes and improvements