fixed graphical errors, also removed some unused stuff and cleaned up classes a tad