Lots of CV fixes
WAX -> service
CV print formatting