Fixing source highlighting, minor changes