Update Readme.md.
Fix: osf genres containing a dash, or starting with '@' were not displayed.
Update Readme.
Remove some TODOs.