Made some slight modifications, particularly to logging in worker and WAPP.