improved history feature

still wip