Implemented selecting of walls.
Fixed merge conflicts.