add java 8 and some changings