fixed up the factory to work with new gameworld objects
fixed surface strategies to use gameworld objects