Documentation updates and small bugfix