Spice: fix comments and various improvements

jonathan poelenrequested to merge
jpoelen/syntax-highlighting:fix_spice into master

Merge request reports