cleaned up cart svc, made header count dynamic