more changes here and there