Added bug fixes for week 31