Add GPS and fix builder