Added some more improvements.