removed break points.
several bug fix