tweak temp file names
add TODO