Improve --help
WIP on handler wakeup