Lots of fixes & change source code comments color