more obstacles
merged master into moreObstacles: a lot of cleaning up (transversal change)