Added confirmation mail + minor fixes