some bugs fixed

something works! wow!