Fixed checks so that you cant continue unless you mark something