syntax fixes/added some stuff to classes