fixes from initial testing.  api and model layout still subject to change