Removed 30 warnings from various classes, 30 remain.
conflict fix