Major code overhaul, to deal with warnings

Android still making noise about, old jdk