pause/restart fix
a lot of changes