Massive Update, bumped version to 1.7