Add BFS and DFS + some fix