Cleaned up repository, some minor code changes

Now into post-hack weekend development