model updates and style improvements