closed two issues, more coding.