Better ToString() formatting of entities, and a silly ArgumentOutOfRangeException fix.