notes on 9-23
some cleanup