tweaks after seeing script in campfire