PEP fixes, add pause for webserver