some npc stuff and tweaked collision resolution