Some updates, added tag links