adding vineyard and block select to lab samples. Add validation to block names and remove block ids.