#3 DOC: Fixes