Updating and bugfixin