Adding a few changes from the badcamp and nycamp posts