Update and fixes