Bug and To do list final updates