Checking in the changes Chad helped me with along with a few other tweaks