fixed some errors incvolving me not using class variables... =/