Fix cell states + add demo data