Various minor tweaks, added a 'Todo' to README