makeCacheMatrix and cacheSolve updated