implement disclaim (removing email address) and various bug fixes