another round of smaller cleanups, getting ready for final check