cleaned up @todos
Merge branch 'release/0.0.7-alpha'