add arrows fix links on docs and fix expand
fix merge conflicts