cleaned up all code and fixed simple bugs