minor changes and annotations