Fixed Here doc format
Added some goals in TODO