finish adding logging, etc