a couple tweaks, need an email fix