fixed subtle invariant bug that was losing a few papers; strengthened other conditionals