Final commits-hopefully all is done