working on history, errors to fix