Additional changes and documentation