Filling with a few more npcs and a few structural changes...