more minor clean up issues fixed