Major code clean up and new ReRequest
Minor clean up
Admin e-mail address configurable
Clean up
Clean up
Clean up