More refactor bug fixes. Fixed suspend time of never. Fixed suspension creating history entry.