comment updates and minor tidy, moved some infra.common code