fixed many error