move column highlighting out of init...
Merge branch 'develop'