Adds "recommender" and "references" tags

Plus a small amount of cleanup