kirk improvments, I'm holding on to some of them for future discussion