Tidying up the config and CLI, little clearner now and should work for cron job