Removed history objects; small bugfixes