a quick update to correct a few coding conventions but RS2 and GC2 have been ignored