Tightened up things and added email for feedback.