Fixes and bug testing to the forms