mailing and more fixes