Improve bug scrip