Minor improvements, documentation updates