#58286184 some changes in controlles + fix some bugs