VESPERS: Getting the default values back to where they were and did a bit of code cleanup.