fix in handler's required data check, fix typos