fix bugs
Fix done