Some SDF improvements (buggy a little)