Addressed all the isseus except the low level ones in the email