upgrade and fixes