warnings finally fixed