Fix + improve doc()