Fixes and week 5