Some tense fixes, @smcquay I imagine you could still flower this up

a bit