fix class variable/methods and add a few things