Fixed heade and correct commas for method params
Added three TODO items.