more testing and cleanups