Added Fekete-style time shift and cleaned up a little.