comments, getters, setters, minor changes