Cleanups, fixes, additions.