Fixed accidential deletion of somethings from the class.