Cleaning up some. Update still not working