added more time shifts for testing
some floating point related bug fixes