more cleanup, testing, etc