some minor changes here and there