more fixes from @brianloveswords review