fix @link_stack implementation, add in addressable and use where possible