a few minor changes here and there....