Pause functionality
Small fixes