Precomputed axial source components added, a few small changes made that should be merged to master