fixes from @briancavalier review