renamed 'server' to 'daemon' and tided up some commands