fixed a lot of form issues. Still needs some fixing though