Cosmetic changes, documentation, and small bugfix