Minor fixes

Spelling, deprecated code, unused variables and docstrings.