fixes + remove static