Minor fixes and added missing files.