Updated todo and version to 0.5.8