fix help message
fix the handlers