Tweaks

I've re-ordered some methods for readability, and fixed the parameter order of a docblock.