Simon: Major bugs fixed for  whole tour planning process