Split ProxyServer runnable portion out

Also fixed some typos