Documentation changes
Variable name changes
Fixed conflicts