fixed more bugs from latest HW test