Update the script to create datadirs and update the TODO list a little.