Added bug fixes for week 12.