fix import problems
fix links and some other problems