Updated forms and added some fixes