fix ansible_facts errors, misc improvements