huge commit, added a lot of forms and fixes