solved qa issues