saved current state;
some fixes;