some fixes, thorough qa notes