Changed formatting and description
Removed TODOs

Now they are bugs/enhancement issues