Do a bunch of cleanup and add /pv <name> <#>