MORE fixes. Still getting used to mass code base.