some more models, and general bugfixes