Fixed couple of problems, esp. RE record counts