Final project fixes