updates from my mod, fix nick collisions, improve history