make a few more things static