Bugfixes
History working!!