some cleanup, getting ready for distribution