fixed retarget and other bugs, removed old forks