fixes record keeping
merging
help