improve errors and chatty bits