minor cleanup and vbump