small bugfixes and improvements
cleaned up Classes.py file