Accessor functions, more consts, commenting