Adding some other familiar dev/debug affordances
Switched parameters to try and catch left over hard coding