- OAA Optimization Tool, UoM and minor fixes