fixed handle bugs and uncluttered users [issue_22]