improve stuff, prep for links