added goblin subtype strings, new default rooms