Bug correction in settings + add comparison of deltaX and deltaY