Adding tags fixed. (Cleanup, doc.)