Add and factor functions; add notes to spec file