cleaned up validation errors, changed to bare analytics