remove bugs (mainly in comments) and add include coloring