Actually Move the tags and other nitpicky nitpicks