last updates and fixes