fixing commenting, adding some todo notes