More updates, and splitting into two files