lots of logging and other cleanup tweaks, invoke callback chains are easier to deal with now