minor modificqtions