corrected names & added link ability