Refactoring. Small fixes. Added sending manual location.
Refactoring
Refactoring