removed some running bugs