updated some class methods and added some variables