new history (incomplete), few bugfixes