Added get_filename(), added formats in YAML file.

Also changed whitespacing for comments in YAML file.