mail form edits
removed the full api
moving some stuff around