Some comments & minor changes