Further work on the sword-kitty cleanup; the transition into him exiting the building is temporarily broken.