Tweaks and suggestions
Update TODO
Update README