solved some of the warnings