Docblock updates, minor cleanup
Reinstate some integration tests
Fix bad varname and missing param on redirects