Fixed a bunch of errors (done in class, pushed later)