General Patch 1

Adding some more advanced features and correcting some bugs