Remove address from string_of_state
Fix comparison function for states
Disable abstract counting