Added some minor improvements.