Nasty, nasty bug with multiple queries and boundaries fixed
Cosmetic
Finally fixed silly issue with 1 pixel
Cosmetic newline