Fixed warps / small changes

bleh