Much more progress on Papyrus fight