clean up
more work on tw0-time env