minor fix
* further work on gps
* revert accidental deletions
* further reverts of accidental changes and improve Hardware code