Done, bilinear interpolation fixed, cleanup