Fixed Rect a bit and started to use Rect in Surface class