Cleanups, fixes, and more clarity.