corrections and adding oop