cleanup, swapped most Scalars to Vec3b