bump TOCs; new target/focus swap macro