Fixed the warnings, again and chenged 2 variables to static