Heike Small changes and notes... fixing merge conflicts by brute force