fix bugs not finished