minor changes and errorfix