bug fix, near usability

fixed some bugs