Edited some classes and added some stuff