fixed week-9-repair

Hi Yaz,
I regrouped the issues. Sorry, I forget to commit individually. I make
notice under each issues and marked as #1-9. sorry for the
inconvenience.