minor changes here and there