most warnings now fixed