Some fixes here and there. Plus an offset thing that can be configured at run time.