Improvements to odata tool

Note: I'm still going through the testing phase.