typos, wrap data properly for entity and check methods