added some options
cleaned up the merge, added output format to be the same as fizzy
cleaned up the output format