Speeds patched up.

The out of bounds stuff still happens though.