singular/plural fixes; removed unnecessary staff test