Spatial fixes
Changed some classes to public