final corrections to models and API methods

Here are all the changes we talked about and final squash of commits