-bugfix,-TODOs in readme