Minor adjusts to docs
Implement grid support to ODM
Merge and resolv conflict