Some doc and minor details