More updates - still a work in progress.