Update noconflict, docs, fix a couple bugs