Coords

Fixes #72 and a few more tweaks