some fixes;
saved current state;