Updated and fixes