Some minor improvements
Corrected coordinates