little more refactoring - draw goblins AND bunnies!!