Fixing command line args, adding a no-daemon option