Some better documentation.
Added tests for new models, fixed relationship