fixed MANY warnings