Fix some bug, still unstable