Comments and minor changes.
Added Ego to store positions.