cleaning warnings and merge local research branch