lots of code cleaning, corridor search