added GPS functionality and improved DB