Various improvements, cleanups, etc.