In response to comments from code review.

This fixes:
    - The name of one of the properties
    - A variable name typo
    - Removes a now out of date comment

This was missed when merging two different branches

Previously we made too many assumptions that lead to this not working
for non orthogonal lattices. This is a simpler method but works quite
nicely.