moved a couple of yet-to-be-addressed points