fixed weird model name/events