Small fixes better data trails