corrections after Arian's input & bug kill