Added NPCs and fixed some issues