fixed more static things