getter and setter & corrections