Fixing cscope and some highlighting