Additions comments & improvements