Fixed and implemented additional tagging code.