cleared up warnings