fix much errors