Add more highlight, and fix version numbers