Add last changes and fixes