Squashed commit of the following:

VQ revamp: lots of VQ related improvements.
Hierarchical RCP more stable now.
Remove VQ variables that are no longer needed.