Another stab at issues with pandas indexing