Fixed up pxl a bit
Pulled hxl's point testing logic out to functions