history integrated... couple of fixes needed