small clean up and todos
additional check of states findAll (seen problem on staging)