housekeeping
more housekeeping
added some getters
Merge branch 'develop'