Minor tweaks
Updated README, added TODO