The bug fixes and stuffs