final corrections from Dejan addressed