Did a bunch of tweaks over the last year or so...

[spicysomtam]

So thought it best to do a pull request on this so you can review. This is running against latest command view and eva firmware.