* minor several changes.