object definitions and minor tweeking of the models