Fix yaml facts loading, better command line switches