model & doc fixes