Added rooms

And fine tuned NPCs