- [WIP] code cleanup -> get ready for 0.8...

time jumps schould now be handled properly...