General cleanup, updated email to point to new PSW address