cleaning and tolerance update. #1