Misc. commenting, corrections.