tags fixed, cleanup