more models and clean-up