linky module and some fixes