More changes + DOC