Merge Max/Lucien

fixed map change, rized cadre, lots of bugs fix