Updated with fixes and changes

removed extraneous files and added more features