Updating and bug fixes, scope untested