Cleaning up some NFRs, adding new ones