Integration Fixes - TODOs, Default Timeline, Code Review
Merge pull request #125 from javierluraschi/Sprint3IntegrationFixes

Integration Fixes - TODOs, Default Timeline, Code Review
minor changes
merge with blessed