FIX: added more info about TODOs. Categorized TODOs into Enhancement or Bug