Changes and Bug Fixes