updates
updates
correct error throwing
tweaks per Qinwei
updated jars
Merge pull request #19 from BranchMetrics/plane-changes

Bundling all changes done on the plane