more stuff fixed , warnings removed