fix typos
use java7 methods/classes
9 files changed