some cleanup and make sure adapters are run. re: #8