emails and such
merge fix