week 2 update with various bugs fixed