pushing week 5 and various updates