merge fixes.
merge fixes and model adjustments