some big fixes and model updates