Small modifications and documentation updates