minor logging changes, bug fixes