some documentation changes, and a fix when nick changes