update changes and fixes