More tweaking to make the interpretation look reasonable

Next step is getting the intpretation passed to the client...