Wrapper, version label, and minor plot fixes

This seems relatively safe to me.