Various updates; this powered the sys demo.