added a bunch more definitions, lowercased...