Last changes and fixes before the END.