added missing files, fixed build issues.