- [WIP] code cleanup

time jumps schould now be handled properly...