Fix up more of the deprecated methods and also the documentation