few changes here and there