minor changes everywere -- Martin