More results and cleanups