Miscellaneous updates.  NPCs are still a work in progress.