Code updated and corrected

Dart editor and environment has to be updated again with respect to
latest changes.
Number of bugs may increase after the update