Made some more improvements.