Check in changes that add support for -box etc. for almost all plots