YAML format for entry file, various fixes