Made some more things public and static