More Offset Fixing

Continued Fixing