added bug fixes for week 18.