fix bugs, draft1