Fixin' some nulls and a penny logic error