made a lot of random changes
fixed count tag merge issues