Fixed and cleaned up coords and annotations.
Added typing to grid.clj.