Haven't been keeping up with uploading changes, lots of stuff...

changed and added. Major cleanup on imports and @Override anotations