Project 4 and minor changes