* minor fixes and modifications