patched many bugs