some style and model modifications