Refactorings and some minor design changes, like priorities and labels.