fixed State entities forms, completes state refactoring