Integrating previous bug fixs.
Integrating Metalua changes to formatter.
Fixing offsets.