Outline, cleanup, add missing fn descs