preliminary nick tracking work
misc fixes
more fixes
fix #313