Update

Changes and fixes