Location info working, fixed some bugs