fixed some experimental changes that ought not to have been committed