General code tightening, add getters and settlers, remove some log debug statements