Dev branch

Changed the comments....