fix blue tag
fixed few bugs