deleted the .orig file in this commit
cosmetic remarks incorporated
Merge branch 'glbugfixes'
cosmetic remarks, pep8 compliance against trailing white spaces, spelling errors
clean up