Changes to lots of stuff

Stuffs not done: NPC, tele CD display