Move some code around.
Add my email address for feedback