some fixes plus one time link