fixed messed up links and messages