tag clean up tweaks as 0.8