Fixed some errors in the form skip. changes file structure & cleaned up input