more models, more temporary fixes