commenting, small changes