more minor clean ups
more #9 stuff