typos in core and handler