More tweaks to histor
update TODO