Cleanup, fixes, additions.