Fixed code highlighting and so ...