More speed stuff

With some bad debugging stuff also. Yeah!