Updating and bug fixing