moved to streams, organized Sf functions
minor changes to Shape and World left behind