Bug fixes

Might actually work totally for multiple columns simultaneously. I
think the only current issue left is counting.