Some minor cleaning up.
Some work towards getting stretched objects to work.