Minor fixes to documentation and variables