Raster scan and cylindrical scan working. Just some minor fixes needed.