Fixed bug where InstanceCollection was never reinitialized.  Fixed some
location code problems.