notes on further work; clean up