fixed a string quotation error and a handler bug