v1.2 debug

removed some bugs