fixed other bug
many fixes committed