Fix some derps and add a helper function for our configuration!