Further updates / debugging.