- more fixes for graph bugs, performance appears decent (note: need to update tracking-tools for these changes)