improved bugs and problem