Some clean up and add ability to accept tags.