Enforce JDK7, close #923
Minor clean up
replace List by Vector when appropriate