data cleanup and a few tweaks