Glacial update

Pull changes into glacial branch. Adds some figures.