Modified API and Added visual errors to forms and macro's