warning fixes; another updates