Doc updates and a small bugfix.