a lot moooore warnings fixed