Smart links and some fixes