small additional changes and questions