Updates to type - O's found by user testing

Bugs reported by Bryan Abney