small changes here and there.. mostly comments