commenting, fixes