fixed several bugs, updated email and messages