fix on the usage
fix bugs