Multiple improvements to VSM charm