update the help string and some small fix