more cleanup / tweaks