Added submit buttons for <enter>
started adding checks