Code and documentation updates