updates who section, among other adjustments
Merge branch 'who' into development
Merge branch 'development'