changed some of the forms around and made them cleaner