added more changes, more comments about changes in classes.py