more testing and cleanup