second round of corrections
version 3 ready
version 3