a little bit of testing and cleanup