Added NPCs and updated collision-detection with NPCs.