Line number fix + comment color adjustment