small changes here and there