More updates. Still a bit to do.