major update. added missing things