Prettier error messages.
Fixed a couple more undeclared function params.