misc cleanups, add objects for shunts and SVC