Bug Fixes. Added Updater