One Pixel: Improvements

More bug fixes and a little optimization.