some small changes here and there