last changes and fixes