added Serial and GPS, also cleaned some code