some fixes;
save current state;