updated docs and fixed model / tests