Cleanup
Tweak coordinate scaling and translation + Add raw coords for reader D