Cleaning up some things and testing them.