Tweaked and added missing files.