Some cleanup and fixup of starter project.