final (hopefully) history api fixes