Fixed black square
Improved getting location + overall fixes