required fields bugs fixed