more infra, modify sys, add refs