Rearranged status rules and improved presentation (#71)