some order changes, links set up