fixed generic handler
some correction
dont rollback
use token type not text
constructor completion