Beggining of waiver form, formatting corrections, bugfix, renaming middleware