Updating some files, adding maintenance