Corrections to code and split

Corrections and splitted SBAS stuff to next commit