Fixes, ready for streaming coordinates