Updating TODO.
Changing snapshot to release + minor clean-up.