fixed excess spacing, added taverns, removed cruft