commenting, some fixes