Rescale time fix

This builds on my previous #17 and fixes some bugs around Rescaling.