cleaned a few things up with links