Pidfile update and cosmetic changes