huge fix to spl and more