Wip/fabs fixes

I did a few adjustments to your commit. Feel free to merge this.