new npc picture and some fixes on collision