updates many requirements

getting requirements updates from Matt's conf branch