week 8 and some fixes on final project