almost all Dejan's corrections