More updates / debugging.