fixed some stuff in the edit event and user forms
form edits
merge