fixes and adjustments

basically object model is working