Added Comments + Some configurations