imroved logging and help