fixed some None time issues