Refactored pause
Some fixes