NPC bots & some fixes