* minor improvements