Final changes and fixes for week 1