Fixed BFS to work with new State arrangement
Merge branch 'BFS_state'