lots of small changes as discussed with gayatri and maheima