Added and debugged some tagging.