* minor improvements.