name fixed, few bug fixed

fixed