Added bug fixes for week 10.