try to fix things
Fix things
Remove somewhat broken pause functionality
Style
Merge branch 'fix'