make more things static