fix history array issue + better look