Changed back to the state, where we consider each attribute at most once in a certain branch, fixed some other minor errors.