Improved npc-drawing, still not correct