Fixes, need GPS to work better