Added missing file, bug fix, reformat