Offset BUG - possible fix

Possible corrections to hour calculations to fix offset problems.