Be more permissive: accept non camel case names
Fix import
Remove unused state keys
Add invariants in waterfall variables calculation
Fix prop type
Add select for reforms