Fixed comments + plus more color in graphics