Changes and bug fixes