code highlighting and misc fixes