Update script comments and add TODO text