Adapt to natural state keys
Properly show the next-state names
States are now handled via database
delete is now called delete!