Develop

Many small fixes !