fix comments
add getter and setter