Cleanup of readme and adding a few more todos.