More additions. Changed some GUI to inner classes.