Fixed some obvious mistakes and applied strict type checking to SurfaceCollections too