minor cleanup, ready for release