Added some small improvements.