Some small documentation updates plus a couple of small bugfixes