Stabilize mostly the current feature set to get Violet Volts back on track.

After this, spend some time slicing out feature patches to submit upstream.