fixed few error