fixed some static data bugs