Several bugs fixed and tested until the return phase (which is already started
in the development)