Minor changes to some classes and main.txt