some cleanup and some small improvements to get/set
interim